Rename to the more correct gtk-go-up.

2001-05-27  Alexander Larsson  <alla@lysator.liu.se>

	* gtk/gtkstock.h (GTK_STOCK_GO_UP):
	Rename to the more correct gtk-go-up.

	* gtk/stock-icons/stock_menu_sort_ascending.png:
	Added new file.

	* gtk/stock-icons/stock_menu_sort_descending.png:
	Changed to show descending instead of ascending.

	* gtk/gtkiconfactory.c:
	Added menu size icon to sort ascending.

	* gtk/stock-icons/Makefile.am:
	Added stock_menu_sort_ascending.png.

	* gtk/gtkseparatormenuitem.c:
	Use correct typenames.

diff --git a/ChangeLog b/ChangeLog
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7656dd9b95c568d4be6822c108899e741c89bd89..1f4e579bf3d71e266bae25921b2153ef11fe5a5d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,23 @@
+2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkstock.h (GTK_STOCK_GO_UP):
+       Rename to the more correct gtk-go-up.
+
+       * gtk/stock-icons/stock_menu_sort_ascending.png:
+       Added new file.
+       
+       * gtk/stock-icons/stock_menu_sort_descending.png:
+       Changed to show descending instead of ascending.
+
+       * gtk/gtkiconfactory.c:
+       Added menu size icon to sort ascending.
+
+       * gtk/stock-icons/Makefile.am:
+       Added stock_menu_sort_ascending.png.
+       
+       * gtk/gtkseparatormenuitem.c:
+       Use correct typenames.
+
 Sun May 20 20:07:35 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 35ce60f20314139898813cbcfd14b3f257b3b7f3..f4d025a04150c1f08ba1adf90f4aa8c6b15b2680 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -489,7 +489,14 @@ get_default_icons (GtkIconFactory *factory)
                            GTK_ICON_SIZE_MENU,
                            GTK_STOCK_SORT_DESCENDING);
   
-  /* Generic size only */
+
+  add_sized_with_fallback (factory,
+                           stock_sort_ascending,
+                           stock_menu_sort_ascending,
+                           GTK_ICON_SIZE_MENU,
+                           GTK_STOCK_SORT_ASCENDING);
+  
+/* Generic size only */
 
   add_unsized (factory, stock_add, GTK_STOCK_ADD);
   add_unsized (factory, stock_align_center, GTK_STOCK_JUSTIFY_CENTER);
@@ -530,7 +537,6 @@ get_default_icons (GtkIconFactory *factory)
   add_unsized (factory, stock_save_as, GTK_STOCK_SAVE_AS);
   add_unsized (factory, stock_search, GTK_STOCK_FIND);
   add_unsized (factory, stock_search_replace, GTK_STOCK_FIND_AND_REPLACE);
-  add_unsized (factory, stock_sort_ascending, GTK_STOCK_SORT_ASCENDING);
   add_unsized (factory, stock_spellcheck, GTK_STOCK_SPELL_CHECK);
   add_unsized (factory, stock_stop, GTK_STOCK_STOP);
   add_unsized (factory, stock_text_bold, GTK_STOCK_BOLD);

diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
index 43437c4bcf1e98b750216a0361644ee83d44409b..77b6b06d20815393b97ba2341212eebdab39ed16 100644 (file)
--- a/gtk/gtkseparatormenuitem.c
+++ b/gtk/gtkseparatormenuitem.c
@@ -39,13 +39,13 @@ gtk_separator_menu_item_get_type (void)
     {
       static const GTypeInfo separator_menu_item_info =
       {
-       sizeof (GtkMenuItemClass),
+       sizeof (GtkSeparatorMenuItemClass),
        NULL,           /* base_init */
        NULL,           /* base_finalize */
        (GClassInitFunc) gtk_separator_menu_item_class_init,
        NULL,           /* class_finalize */
        NULL,           /* class_data */
-       sizeof (GtkMenuItem),
+       sizeof (GtkSeparatorMenuItem),
        16,             /* n_preallocs */
        (GInstanceInitFunc) NULL,
       };

diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 9ca91aab04eded1a1d3d5c104fc203862d876900..c870bbbb771e7f547483cc64326f57eec2cf3162 100644 (file)
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -89,7 +89,7 @@ void          gtk_stock_item_free (GtkStockItem       *item);
 #define GTK_STOCK_GO_BACK          "gtk-go-back"
 #define GTK_STOCK_GO_DOWN          "gtk-go-down"
 #define GTK_STOCK_GO_FORWARD       "gtk-go-forward"
-#define GTK_STOCK_GO_UP            "gtk-up"
+#define GTK_STOCK_GO_UP            "gtk-go-up"
 #define GTK_STOCK_HELP             "gtk-help"
 #define GTK_STOCK_HOME             "gtk-home"
 #define GTK_STOCK_INDEX            "gtk-index"

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 29d5b6e2cf72ddf1a247f932cc04c4576439d28b..eac408bce1ea17d494a89406f339366af98c9e68 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -37,6 +37,7 @@ IMAGES = @STRIP_BEGIN@                        \
        stock_last.png                  \
        stock_left_arrow.png            \
        stock_menu_print_preview.png    \
+       stock_menu_sort_ascending.png   \
        stock_menu_sort_descending.png  \
        stock_new.png                   \
        stock_open.png                  \
@@ -109,6 +110,7 @@ VARIABLES = @STRIP_BEGIN@                                                                   \
                 stock_last                     $(srcdir)/stock_last.png                        \
                 stock_left_arrow               $(srcdir)/stock_left_arrow.png                  \
                 stock_menu_print_preview       $(srcdir)/stock_menu_print_preview.png          \
+                stock_menu_sort_ascending      $(srcdir)/stock_menu_sort_ascending.png        \
                 stock_menu_sort_descending     $(srcdir)/stock_menu_sort_descending.png        \
                stock_new                       $(srcdir)/stock_new.png                         \
                stock_open                      $(srcdir)/stock_open.png                        \

diff --git a/gtk/stock-icons/stock_menu_sort_ascending.png b/gtk/stock-icons/stock_menu_sort_ascending.png
new file mode 100644 (file)
index 0000000..bfb9c0b
Binary files /dev/null and b/gtk/stock-icons/stock_menu_sort_ascending.png differ

diff --git a/gtk/stock-icons/stock_menu_sort_descending.png b/gtk/stock-icons/stock_menu_sort_descending.png
index bfb9c0b8dab4f5e3ae5faf0c30ce686c5e279f5d..1989e08d8f4265eaa9ce77560578a83a7063ba08 100644 (file)
Binary files a/gtk/stock-icons/stock_menu_sort_descending.png and b/gtk/stock-icons/stock_menu_sort_descending.png differ

diff --git a/gtk/stock-icons/stock_sort_ascending_16.png b/gtk/stock-icons/stock_sort_ascending_16.png
new file mode 100644 (file)
index 0000000..bfb9c0b
Binary files /dev/null and b/gtk/stock-icons/stock_sort_ascending_16.png differ

diff --git a/gtk/stock-icons/stock_sort_descending_16.png b/gtk/stock-icons/stock_sort_descending_16.png
index bfb9c0b8dab4f5e3ae5faf0c30ce686c5e279f5d..1989e08d8f4265eaa9ce77560578a83a7063ba08 100644 (file)
Binary files a/gtk/stock-icons/stock_sort_descending_16.png and b/gtk/stock-icons/stock_sort_descending_16.png differ